diff --git a/systems/common/global/default.nix b/systems/common/global/default.nix
index 3cd16d1..bfafb38 100644
--- a/systems/common/global/default.nix
+++ b/systems/common/global/default.nix
@@ -1,4 +1,5 @@
 {
+  config,
   lib,
   inputs,
   outputs,
@@ -17,6 +18,8 @@
     ./ssh.nix
   ];
 
+  kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
+
   security.auditd.enable = lib.mkDefault true;
 
   programs = {
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index d7c6fcc..fc6de30 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -18,14 +18,11 @@ in
     ./services.nix
   ];
 
-  boot = {
-    zfs.extraPools = [
-      "media"
-      "storage"
-      "torrenting"
-    ];
-    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-  };
+  boot.zfs.extraPools = [
+    "media"
+    "storage"
+    "torrenting"
+  ];
 
   services = {
     openssh.ports = [ 629 ];