diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4374aae..039cd08 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,4 +1,10 @@
-{ pkgs ? import <nixpkgs> {} }:
+let
+  nixpkgsPinned = import ./nixpkgs-pinned.nix;
+in
+# Set default values for use without flakes
+{ pkgs ? import <nixpkgs> { config = {}; overlays = []; }
+, pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; }
+}:
 let self = {
   spark-wallet = pkgs.callPackage ./spark-wallet { };
   liquid-swap = pkgs.python3Packages.callPackage ./liquid-swap { };
@@ -16,7 +22,7 @@ let self = {
     packageOverrides = import ./python-packages self;
   }).pkgs;
 
-  pinned = import ./pinned.nix;
+  pinned = import ./pinned.nix pkgs pkgsUnstable;
 
   modulesPkgs = self // self.pinned;
 }; in self
diff --git a/pkgs/pinned.nix b/pkgs/pinned.nix
index 0851d03..3c4337b 100644
--- a/pkgs/pinned.nix
+++ b/pkgs/pinned.nix
@@ -1,12 +1,6 @@
-let
-  nixpkgsPinned = import ./nixpkgs-pinned.nix;
-  nixpkgsStable = import nixpkgsPinned.nixpkgs { config = {}; overlays = []; };
-  nixpkgsUnstable = import nixpkgsPinned.nixpkgs-unstable { config = {}; overlays = []; };
-  nixBitcoinPkgsStable = import ./. { pkgs = nixpkgsStable; };
-  nixBitcoinPkgsUnstable = import ./. { pkgs = nixpkgsUnstable; };
-in
+pkgs: pkgsUnstable:
 {
-  inherit (nixpkgsUnstable)
+  inherit (pkgsUnstable)
     bitcoin
     bitcoind
     charge-lnd
@@ -21,8 +15,5 @@ in
     lightning-loop
     lightning-pool;
 
-  inherit nixpkgsStable nixpkgsUnstable;
-
-  stable = nixBitcoinPkgsStable;
-  unstable = nixBitcoinPkgsUnstable;
+  inherit pkgs pkgsUnstable;
 }
diff --git a/pkgs/python-packages/default.nix b/pkgs/python-packages/default.nix
index d8cbc5b..66e0961 100644
--- a/pkgs/python-packages/default.nix
+++ b/pkgs/python-packages/default.nix
@@ -4,8 +4,6 @@ let
 
   joinmarketPkg = pkg: callPackage pkg { inherit (nbPkgs.joinmarket) version src; };
   clightningPkg = pkg: callPackage pkg { inherit (nbPkgs.pinned) clightning; };
-
-  unstable = (import ../nixpkgs-pinned.nix).nixpkgs-unstable;
 in {
   bencoderpyx = callPackage ./bencoderpyx {};
   coincurve = callPackage ./coincurve {};