diff --git a/flake.nix b/flake.nix
index 873c239..be56541 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,7 +73,7 @@
           nix-bitcoin.pkgs =
             if config.nix-bitcoin.useVersionLockedPkgs
             then (self.lib.mkNbPkgs { inherit (config.nixpkgs) system; }).modulesPkgs
-            else (self.lib.mkNbPkgs { inherit (pkgs) system; inherit pkgs; }).modulesPkgs;
+            else (self.lib.mkNbPkgs { inherit (pkgs.stdenv.hostPlatform) system; inherit pkgs; }).modulesPkgs;
         };
       };
 
diff --git a/modules/charge-lnd.nix b/modules/charge-lnd.nix
index 5e6991b..d9053c9 100644
--- a/modules/charge-lnd.nix
+++ b/modules/charge-lnd.nix
@@ -75,7 +75,7 @@ let
   group = user;
   dataDir = "/var/lib/charge-lnd";
   configFile = builtins.toFile "charge-lnd.config" cfg.policies;
-  checkedConfig = pkgs.runCommandNoCC "charge-lnd-checked.config" { } ''
+  checkedConfig = pkgs.runCommand "charge-lnd-checked.config" { } ''
     ${config.nix-bitcoin.pkgs.charge-lnd}/bin/charge-lnd --check --config ${configFile}
     cp ${configFile} $out
   '';
diff --git a/modules/lndconnect.nix b/modules/lndconnect.nix
index 0bd370a..df5494c 100644
--- a/modules/lndconnect.nix
+++ b/modules/lndconnect.nix
@@ -124,7 +124,7 @@ let
   # TODO-EXTERNAL:
   # lndconnect requires a --configfile argument, although it's unused
   # https://github.com/LN-Zap/lndconnect/issues/25
-  pkgs.hiPrio (pkgs.writeScriptBin name ''
+  lib.hiPrio (pkgs.writeScriptBin name ''
     ${shebang}
     url=$(
       ${getExe config.nix-bitcoin.pkgs.lndconnect} --url \
diff --git a/modules/netns-isolation.nix b/modules/netns-isolation.nix
index 9357503..683331b 100644
--- a/modules/netns-isolation.nix
+++ b/modules/netns-isolation.nix
@@ -157,7 +157,7 @@ in {
         veth = "nb-veth-${toString v.id}";
         peer = "nb-veth-br-${toString v.id}";
         inherit (v) netnsName;
-        nsenter = "${pkgs.utillinux}/bin/nsenter";
+        nsenter = "${pkgs.util-linux}/bin/nsenter";
         allowedNetnsAddresses = map (available: netns.${available}.address) v.availableNetns;
         allowedAddresses = concatStringsSep ","
           ([ "127.0.0.1,${bridgeIp},${v.address}" ] ++ allowedNetnsAddresses);
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 4ba0acb..a2e8859 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -4,14 +4,14 @@ in
 # Set default values for use without flakes
 { pkgs ? import <nixpkgs> { config = {}; overlays = []; }
 , pkgsUnstable ? import nixpkgsPinned.nixpkgs-unstable {
-    inherit (pkgs.stdenv) system;
+    inherit (pkgs.stdenv.hostPlatform) system;
     config = {};
     overlays = [];
   }
 }:
 let self = {
   clightning-rest = pkgs.callPackage ./clightning-rest { inherit (self) fetchNodeModules; };
-  clightning-plugins = pkgs.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
+  clightning-plugins = pkgs.lib.recurseIntoAttrs (import ./clightning-plugins pkgs self.nbPython3Packages);
   clnrest = pkgs.callPackage ./clnrest { inherit (self.pinned) clightning; };
   joinmarket = pkgs.callPackage ./joinmarket { inherit (self) nbPython3PackagesJoinmarket; };
   lndinit = pkgs.callPackage ./lndinit { };