diff --git a/codedown.nix b/codedown.nix
index 5aded898..5a0fdfc2 100644
--- a/codedown.nix
+++ b/codedown.nix
@@ -16,11 +16,11 @@ let
 in
 
 rec {
-  spellchecker = pkgsMaster.callPackage ./modules/language_servers/markdown-spellcheck-lsp {};
+  spellchecker = callPackage ./modules/language_servers/markdown-spellcheck-lsp {};
 
   testing = {
-    builds-forever = pkgsMaster.callPackage ./modules/testing/builds-forever/default.nix {};
-    builder-uid = pkgsMaster.callPackage ./modules/testing/builder-uid/default.nix {};
+    builds-forever = callPackage ./modules/testing/builds-forever/default.nix {};
+    builder-uid = callPackage ./modules/testing/builder-uid/default.nix {};
   };
 
   # Exported so clients can build searchers for other package sets, like "codedown.searcher nixpkgs"
diff --git a/modules/kernels/bash/kernel.nix b/modules/kernels/bash/kernel.nix
index 01b1264d..d6e2a952 100644
--- a/modules/kernels/bash/kernel.nix
+++ b/modules/kernels/bash/kernel.nix
@@ -26,9 +26,6 @@ let
 
   python = python3.withPackages (ps: [bash-kernel]);
 
-  # Checks failed on macOS on release-25.05. Disabling them is one option:
-  # python = python3.withPackages (ps: [(ps.bash-kernel.overrideAttrs (_oldAttrs: { doCheck = false; }))]);
-
   # bash_kernel submits a cell to bash one line at a time over a PTY (~50ms/line),
   # so inlining the ~150-line inspector made the first run take ~10s. Source the
   # script from a one-line loader instead
diff --git a/modules/kernels/bash/module.nix b/modules/kernels/bash/module.nix
index fa823af2..da71fc40 100644
--- a/modules/kernels/bash/module.nix
+++ b/modules/kernels/bash/module.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  pkgsToUse = config.pkgsMaster;
+  pkgsToUse = config.pkgs;
 
 in
 
diff --git a/modules/language_servers/spellchecker/module.nix b/modules/language_servers/spellchecker/module.nix
index bc238b03..55cece6d 100644
--- a/modules/language_servers/spellchecker/module.nix
+++ b/modules/language_servers/spellchecker/module.nix
@@ -3,7 +3,7 @@
 with lib;
 
 let
-  pkgsToUse = config.pkgsMaster;
+  pkgsToUse = config.pkgs;
 
   cfg = config.language-servers.spellchecker;