diff --git a/hosts/andromache/default.nix b/hosts/andromache/default.nix
index 0eb3dab..1cc7d18 100644
--- a/hosts/andromache/default.nix
+++ b/hosts/andromache/default.nix
@@ -91,6 +91,7 @@ in
     enable = true;
     interfaces.eno1 = { inherit (wolInterfaces.eno1) macAddress; };
   };
+  zfs.enable = true;
 
   disko.devices = {
     disk.data = {
diff --git a/hosts/astyanax/default.nix b/hosts/astyanax/default.nix
index 271b225..8867fe4 100644
--- a/hosts/astyanax/default.nix
+++ b/hosts/astyanax/default.nix
@@ -67,6 +67,7 @@ in
     };
   };
   taskwarrior.enable = true;
+  zfs.enable = true;
 
   secrets.nixSigningKey.enable = true;
   restic-backup.enable = true;
diff --git a/modules/common/default.nix b/modules/common/default.nix
index 3d24c11..59d20e3 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -12,7 +12,6 @@
 
   config = {
     system.stateVersion = lib.mkDefault "25.05";
-    boot.zfs.forceImportRoot = lib.mkDefault false;
 
     environment.defaultPackages = lib.mkForce [ ];
     environment.pathsToLink = [
diff --git a/modules/zfs/default.nix b/modules/zfs/default.nix
new file mode 100644
index 0000000..137f561
--- /dev/null
+++ b/modules/zfs/default.nix
@@ -0,0 +1,15 @@
+{ lib, config, ... }:
+
+{
+  options.zfs.enable = lib.mkOption {
+    default = false;
+    type = lib.types.bool;
+  };
+
+  config = lib.mkIf config.zfs.enable {
+    boot = {
+      kernelParams = [ "zfs.zfs_arc_max=12884901888" ];
+      zfs.forceImportRoot = lib.mkDefault false;
+    };
+  };
+}