diff --git a/ci-root.nix b/ci-root.nix
index b0d9a808f4..3d49bc344f 100644
--- a/ci-root.nix
+++ b/ci-root.nix
@@ -7,7 +7,7 @@ let
   pkgs = depot.third_party.nixpkgs;
   lib = pkgs.lib;
   prefixAttrs = prefix: lib.mapAttrsToList (name: value: { name = "${prefix}-${name}"; path = value; });
-  ciMachines = prefixAttrs "machine" depot.ops.nixos;
+  ciMachines = prefixAttrs "machine" depot.ops.nixos.systems;
   ciPackages = prefixAttrs "pkg" depot.nix.pkgs;
   ciDocker = prefixAttrs "docker" ((import ./docker-images.nix).images);
 
diff --git a/ops/nixos/default.nix b/ops/nixos/default.nix
index 5376237abc..ada600ca88 100644
--- a/ops/nixos/default.nix
+++ b/ops/nixos/default.nix
@@ -23,5 +23,6 @@ let
   systemDrvs = mapAttrs (_: sys: sys.config.system.build.toplevel) evaledSystems;
   systemTailscaleIPs = lib.mapAttrs' (n: v: lib.nameValuePair v [n]) (lib.filterAttrs (n: v: v != null) (mapAttrs (_: sys: sys.config.my.ip.tailscale) evaledSystems));
 in systemDrvs // {
+  systems = systemDrvs;
   tailscaleIPs = systemTailscaleIPs;
 }
diff --git a/third_party/default.nix b/third_party/default.nix
index 80e0fc3d9c..8173b976d5 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -46,5 +46,5 @@ rec {
   readTree = import ./tvl/nix/readTree {};
   gopkgs = readTree ch ./gopkgs;
 
-  crate2nix = import "${crate2nixSrc}" {};
+  crate2nix = import "${crate2nixSrc}" { pkgs = ch.depot.pkgs; };
 }