diff --git a/guix/build/download.scm b/guix/build/download.scm
index 641dacefa1f49fc518fc407e29877b898d940c75..0f2d5f402afd7e1a52d66a779da9e1b53b272057 100644
--- a/guix/build/download.scm
+++ b/guix/build/download.scm
@@ -158,7 +158,8 @@ (define* (ftp-fetch uri file #:key timeout print-build-trace?)
 (define (load-gnutls)
   ;; XXX: Use this hack instead of #:autoload to avoid compilation errors.
   ;; See <http://bugs.gnu.org/12202>.
-  (module-use! (current-module) (resolve-interface '(gnutls)))
+  (module-use! (resolve-module '(guix build download))
+               (resolve-interface '(gnutls)))
   (set! load-gnutls (const #t)))
 
 (define %x509-certificate-directory
diff --git a/guix/git.scm b/guix/git.scm
index 15a0a6f9e5cab1773b651273842a7ec331d87f92..a12f1eec8ea5ab153a7bce9b7427e1ddb9c8a673 100644
--- a/guix/git.scm
+++ b/guix/git.scm
@@ -203,7 +203,7 @@ (define (load-git-submodules)
      (set! load-git-submodules (const #f))
      #f)
     (iface
-     (module-use! (current-module) iface)
+     (module-use! (resolve-module '(guix git)) iface)
      (set! load-git-submodules (const #t))
      #t)))