diff --git a/lib/default.nix b/lib/default.nix
index 8f17b57..f613ba1 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,5 +1,8 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  fetchers = import ./fetchers { inherit pkgs; };
-  runtime = import ./runtime { inherit pkgs; };
+  fetchers = callPackage ./fetchers { };
+  runtime = callPackage ./runtime { };
 }
diff --git a/lib/fetchers/default.nix b/lib/fetchers/default.nix
index 2b9448f..4640293 100644
--- a/lib/fetchers/default.nix
+++ b/lib/fetchers/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  sshKnownHosts = import ./sshKnownHosts { inherit pkgs; };
+  sshKnownHosts = callPackage ./sshKnownHosts { };
 }
diff --git a/lib/runtime/default.nix b/lib/runtime/default.nix
index 8c9cbce..27040c2 100644
--- a/lib/runtime/default.nix
+++ b/lib/runtime/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  merge = import ./merge { inherit pkgs; };
+  merge = callPackage ./merge { };
 }
diff --git a/lib/runtime/merge/default.nix b/lib/runtime/merge/default.nix
index 347ec94..9324954 100644
--- a/lib/runtime/merge/default.nix
+++ b/lib/runtime/merge/default.nix
@@ -1,4 +1,7 @@
 { pkgs, ... }:
+let
+  callPackage = pkgs.lib.callPackageWith { inherit pkgs; };
+in
 {
-  keyValue = import ./keyValue { inherit pkgs; };
+  keyValue = callPackage ./keyValue { };
 }