diff --git a/modules/default.nix b/modules/default.nix
index 621ab8f..6664741 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,4 +1,5 @@
 {
+  modules = ./modules.nix;
   bitcoind = ./bitcoind.nix;
   clightning = ./clightning.nix;
   default = ./default.nix;
@@ -7,7 +8,6 @@
   liquid = ./liquid.nix;
   nanopos = ./nanopos.nix;
   nix-bitcoin = ./nix-bitcoin.nix;
-  nix-bitcoin-pkgs = ./nix-bitcoin-pkgs.nix;
   nix-bitcoin-webindex = ./nix-bitcoin-webindex.nix;
   spark-wallet = ./spark-wallet.nix;
   recurring-donations = ./recurring-donations.nix;
diff --git a/modules/modules.nix b/modules/modules.nix
new file mode 100644
index 0000000..7dba3c6
--- /dev/null
+++ b/modules/modules.nix
@@ -0,0 +1,31 @@
+{ config, pkgs, ... }:
+let
+  nixpkgs-pinned = import ../pkgs/nixpkgs-pinned.nix;
+  unstable = import nixpkgs-pinned.nixpkgs-unstable {};
+
+  allPackages = pkgs: (import ../pkgs { inherit pkgs; }) // {
+    bitcoin = unstable.bitcoin.override { miniupnpc = null; };
+    bitcoind = unstable.bitcoind.override { miniupnpc = null; };
+    clightning = unstable.clightning;
+    lnd = unstable.lnd;
+  };
+in {
+  imports = [
+    ./bitcoind.nix
+    ./clightning.nix
+    ./lightning-charge.nix
+    ./nanopos.nix
+    ./nix-bitcoin-webindex.nix
+    ./liquid.nix
+    ./spark-wallet.nix
+    ./electrs.nix
+    ./onion-chef.nix
+    ./recurring-donations.nix
+    ./hardware-wallets.nix
+    ./lnd.nix
+  ];
+
+  disabledModules = [ "services/networking/bitcoind.nix" ];
+
+  nixpkgs.overlays = [ (self: super: allPackages super) ];
+}
diff --git a/modules/nix-bitcoin-pkgs.nix b/modules/nix-bitcoin-pkgs.nix
deleted file mode 100644
index d5c8bd5..0000000
--- a/modules/nix-bitcoin-pkgs.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ config, pkgs, ... }:
-let
-  nixpkgs-pinned = import ../pkgs/nixpkgs-pinned.nix;
-  nixpkgs-unstable = import nixpkgs-pinned.nixpkgs-unstable { };
-in {
-  disabledModules = [ "services/networking/bitcoind.nix" ];
-
-  nixpkgs.overlays = [ (import ../overlay.nix) ];
-
-  nixpkgs.config.packageOverrides = pkgs: {
-    # Use bitcoin and clightning from unstable
-    bitcoin = nixpkgs-unstable.bitcoin.override { miniupnpc = null; };
-    blockchains.bitcoind = nixpkgs-unstable.bitcoind.override { miniupnpc = null; };
-    clightning = nixpkgs-unstable.clightning.override { };
-    lnd = nixpkgs-unstable.lnd.override { };
-  };
-}
diff --git a/modules/nix-bitcoin.nix b/modules/nix-bitcoin.nix
index 351bb72..2ae3ac4 100644
--- a/modules/nix-bitcoin.nix
+++ b/modules/nix-bitcoin.nix
@@ -15,21 +15,7 @@ let
     chown -R operator ${config.users.users.operator.home}/.ssh
   '';
 in {
-  imports = [
-    ./nix-bitcoin-pkgs.nix
-    ./bitcoind.nix
-    ./clightning.nix
-    ./lightning-charge.nix
-    ./nanopos.nix
-    ./nix-bitcoin-webindex.nix
-    ./liquid.nix
-    ./spark-wallet.nix
-    ./electrs.nix
-    ./onion-chef.nix
-    ./recurring-donations.nix
-    ./hardware-wallets.nix
-    ./lnd.nix
-  ];
+  imports = [ ./modules.nix ];
 
   options.services.nix-bitcoin = {
     enable = mkOption {
@@ -207,4 +193,3 @@ in {
     ];
   };
 }
-