diff --git a/nix-bitcoin.nix b/nix-bitcoin.nix
index 92b85bd..adc563b 100644
--- a/nix-bitcoin.nix
+++ b/nix-bitcoin.nix
@@ -8,11 +8,11 @@
    unstable-pkgs = import unstable-pkgs-git { };
 
    # Custom packages
-   nodeinfo = (import pkgs/nodeinfo.nix);
+   nodeinfo = (import pkgs/nodeinfo.nix) { inherit pkgs; };
    lightning-charge = import pkgs/lightning-charge.nix { inherit pkgs; };
    nanopos = import pkgs/nanopos.nix { inherit pkgs; };
    spark-wallet = import pkgs/spark-wallet.nix  { inherit pkgs; };
-   liquidd = import pkgs/liquidd.nix;
+   liquidd = pkgs.callPackage (import pkgs/liquidd.nix) { };
 in {
   disabledModules = [ "services/security/tor.nix" ];
   imports =
@@ -32,6 +32,6 @@ in {
     inherit lightning-charge;
     inherit nanopos;
     inherit spark-wallet;
-    liquidd = (pkgs.callPackage liquidd { });
+    inherit liquidd;
   };
 }
diff --git a/pkgs/lightning-charge.nix b/pkgs/lightning-charge.nix
index 91d52e1..6ffc2d0 100644
--- a/pkgs/lightning-charge.nix
+++ b/pkgs/lightning-charge.nix
@@ -1,6 +1,4 @@
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+{pkgs, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
 
 
 with pkgs;
diff --git a/pkgs/nanopos.nix b/pkgs/nanopos.nix
index c858139..be60aba 100644
--- a/pkgs/nanopos.nix
+++ b/pkgs/nanopos.nix
@@ -1,6 +1,4 @@
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+{pkgs, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
 
 
 with pkgs;
diff --git a/pkgs/nodeinfo.nix b/pkgs/nodeinfo.nix
index db0699f..fa56b1a 100644
--- a/pkgs/nodeinfo.nix
+++ b/pkgs/nodeinfo.nix
@@ -1,5 +1,6 @@
-with import <nixpkgs> {}; # bring all of Nixpkgs into scope
+{pkgs}:
 
+with pkgs;
 stdenv.mkDerivation {
   name = "nodeinfo";
   src = ./nodeinfo.sh;
diff --git a/pkgs/spark-wallet.nix b/pkgs/spark-wallet.nix
index 9f20ebf..72f11b3 100644
--- a/pkgs/spark-wallet.nix
+++ b/pkgs/spark-wallet.nix
@@ -1,6 +1,4 @@
-{pkgs ? import <nixpkgs> {
-    inherit system;
-  }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
+{pkgs, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-8_x"}:
 
 
 with pkgs;