diff --git a/hosts/default.nix b/hosts/default.nix
index 788c2184..849af9b3 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -53,7 +53,6 @@ let
 
             nix.registry = {
               master.flake = master;
-              nixflk.flake = self;
               nixpkgs.flake = nixos;
             };
 
diff --git a/nix/ci.nix b/nix/ci.nix
index 3a6ac1e4..4d2a66fd 100644
--- a/nix/ci.nix
+++ b/nix/ci.nix
@@ -5,14 +5,17 @@ let
 
   packages = import ../default.nix;
 
-  shell = recurseIntoAttrs default.devShell.x86_64-linux;
+  shell = recurseIntoAttrs {
+    inherit (default.devShell)
+      i686-linux x86_64-linux;
+  };
 
-  # failing on hercules-ci, probably until nix is updated
-  # ci = recurseIntoAttrs
-  #   default.nixosConfigurations.ci.config.system.build.toplevel;
+  ci = recurseIntoAttrs {
+    nixos = default.nixosConfigurations.ci.config.system.build.toplevel;
+  };
 in
 {
-  inherit shell;
+  inherit shell ci;
   # platforms supported by our hercules-ci agent
   inherit (packages)
     i686-linux