diff --git a/flake.nix b/flake.nix
index 377247cb8..9f494cb15 100644
--- a/flake.nix
+++ b/flake.nix
@@ -270,8 +270,11 @@
           (lib.genAttrs stdenvs (_: { })))
         {
           "nix" = { };
-          "nix-util" = { };
-          "nix-store" = { };
+          # Temporarily disabled because GitHub Actions OOM issues. Once
+          # the old build system is gone and we are back to one build
+          # system, we should reenable these.
+          #"nix-util" = { };
+          #"nix-store" = { };
         }
         // lib.optionalAttrs (builtins.elem system linux64BitSystems) {
         dockerImage =
diff --git a/maintainers/hydra.nix b/maintainers/hydra.nix
index d53647549..cc0dadac9 100644
--- a/maintainers/hydra.nix
+++ b/maintainers/hydra.nix
@@ -41,7 +41,8 @@ let
 in
 {
   # Binary package for various platforms.
-  build = forAllSystems (system: self.packages.${system}.nix);
+  build = forAllPackages (pkgName:
+    forAllSystems (system: nixpkgsFor.${system}.native.${pkgName}));
 
   shellInputs = forAllSystems (system: self.devShells.${system}.default.inputDerivation);