diff --git a/nixosModules/clanCore/default.nix b/nixosModules/clanCore/default.nix
index cb469bee3..e7ebe87a9 100644
--- a/nixosModules/clanCore/default.nix
+++ b/nixosModules/clanCore/default.nix
@@ -1,3 +1,4 @@
+{ lib, config, ... }:
 {
   imports = [
     ./backups.nix
@@ -18,5 +19,17 @@
     ./vm.nix
     ./wayland-proxy-virtwl.nix
     ./zerotier
+    ./zfs.nix
   ];
+
+  # Use systemd during boot as well except:
+  # - systems with raids as this currently require manual configuration: https://github.com/NixOS/nixpkgs/issues/210210
+  # - for containers we currently rely on the `stage-2` init script that sets up our /etc
+  boot.initrd.systemd.enable = lib.mkDefault (!config.boot.swraid.enable && !config.boot.isContainer);
+
+  # Work around for https://github.com/NixOS/nixpkgs/issues/124215
+  documentation.info.enable = lib.mkDefault false;
+
+  # Don't install the /lib/ld-linux.so.2 stub. This saves one instance of nixpkgs.
+  environment.ldso32 = null;
 }
diff --git a/nixosModules/zfs.nix b/nixosModules/clanCore/zfs.nix
similarity index 100%
rename from nixosModules/zfs.nix
rename to nixosModules/clanCore/zfs.nix
diff --git a/nixosModules/flake-module.nix b/nixosModules/flake-module.nix
index 1977b9bf3..d192af01d 100644
--- a/nixosModules/flake-module.nix
+++ b/nixosModules/flake-module.nix
@@ -3,12 +3,10 @@
   flake.nixosModules = {
     hidden-ssh-announce.imports = [ ./hidden-ssh-announce.nix ];
     bcachefs.imports = [ ./bcachefs.nix ];
-    zfs.imports = [ ./zfs.nix ];
     installer.imports = [
       ./installer
       self.nixosModules.hidden-ssh-announce
       self.nixosModules.bcachefs
-      self.nixosModules.zfs
     ];
     clanCore.imports = [
       inputs.sops-nix.nixosModules.sops