diff --git a/common/global/default.nix b/common/global/default.nix
index 683bb40..d9978fc 100644
--- a/common/global/default.nix
+++ b/common/global/default.nix
@@ -42,7 +42,17 @@
     };
   };
 
-  services.fwupd.enable = true;
+  services = {
+    # firmware update
+    fwupd.enable = true;
+
+    snapshot_manager.enable = lib.mkDefault true;
+
+    zfs = {
+      trim.enable = lib.mkDefault true;
+      autoScrub.enable = lib.mkDefault true;
+    };
+  };
 
   programs.zsh.enable = true;
 
diff --git a/systems/bob/default.nix b/systems/bob/default.nix
index f796a5d..155aacd 100644
--- a/systems/bob/default.nix
+++ b/systems/bob/default.nix
@@ -31,7 +31,6 @@
     };
   };
 
-
   services = {
     displayManager = {
       enable = true;
@@ -43,13 +42,6 @@
     };
 
     openssh.ports = [ 262 ];
-
-    snapshot_manager.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
   };
 
   system.stateVersion = "24.05";
diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix
index 352f2d6..88f1059 100644
--- a/systems/jeeves/default.nix
+++ b/systems/jeeves/default.nix
@@ -37,17 +37,7 @@ in
 
     smartd.enable = true;
 
-    snapshot_manager = {
-      enable = true;
-      path = ./snapshot_config.toml;
-    };
-
-    sysstat.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
+    snapshot_manager.path = ./snapshot_config.toml;
   };
 
   system.stateVersion = "24.05";
diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix
index 9af1304..369df53 100644
--- a/systems/rhapsody-in-green/default.nix
+++ b/systems/rhapsody-in-green/default.nix
@@ -29,18 +29,7 @@
     };
   };
 
-
-  services = {
-
-    openssh.ports = [ 922 ];
-
-    snapshot_manager.enable = true;
-
-    zfs = {
-      trim.enable = true;
-      autoScrub.enable = true;
-    };
-  };
+  services.openssh.ports = [ 922 ];
 
   system.stateVersion = "24.05";
 }