diff --git a/outputs.nix b/outputs.nix
index 9b268dd..2a56c20 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -1,13 +1,11 @@
-{ inputs ? import ./inputs.nix {}
-, selfPath ? builtins.toString ./.
-}:
+{ inputs ? import ./inputs.nix {} }:
 
 let
 
 lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib/overlays/version-info-fixup.nix { inherit inputs; });
 
 self = {
-  inherit lib;
+  inherit lib inputs;
   modifiedNixpkgs     = import ./pkgs/top-level/impure.nix;
   modifiedNixpkgsPure = import ./pkgs/top-level/default.nix;
   overlays = {
@@ -39,7 +37,7 @@ self = {
           ./hosts/${name}
           {
             config.nixpkgs.overlays = [
-              ( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = ./pkgs/top-level/impure.nix; } )
+              ( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } )
               self.overlays.versionInfoFixup
             ];
           }
diff --git a/pkgs/overlays/selfExpr.nix b/pkgs/overlays/selfExpr.nix
index 1be552e..ae28729 100644
--- a/pkgs/overlays/selfExpr.nix
+++ b/pkgs/overlays/selfExpr.nix
@@ -25,7 +25,7 @@ self: super: {
     in ''
       { ... } @ args:
 
-      import ${builtins.toString nixpkgsPath} {
+      import ${nixpkgsPath} {
         ${self.lib.optionalString useConfig configText}
       } // builtins.removeAttrs args (builtins.fromJSON '''
         ${removedAttrNamesText}