diff --git a/home-manager/default.nix b/home-manager/default.nix
index f2b994954..79f3e6d09 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -3,10 +3,10 @@
 let
 
   homeManagerExpr = pkgs.writeText "home-manager.nix" ''
-    { pkgs ? import <nixpkgs> {}, confPath, modulesPath }:
+    { pkgs ? import <nixpkgs> {}, confPath }:
 
     let
-      env = import modulesPath {
+      env = import <home-manager> {
         configuration = import confPath;
         pkgs = pkgs;
       };
diff --git a/home-manager/home-manager b/home-manager/home-manager
index f8fe71317..e5111f512 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -41,6 +41,8 @@ function doBuild() {
         exit 1
     fi
 
+    export NIX_PATH="$NIX_PATH${NIX_PATH:+:}home-manager=@MODULES_PATH@"
+
     local extraArgs
     extraArgs=""
 
@@ -54,7 +56,6 @@ function doBuild() {
 
     nix-build $extraArgs \
               "@HOME_MANAGER_EXPR_PATH@" \
-              --argstr modulesPath "@MODULES_PATH@" \
               --argstr confPath "$confFile" \
               -A activation-script \
               -o "$output"