diff --git a/modules/common/features/laptop.nix b/modules/common/features/laptop.nix
new file mode 100644
index 0000000..64ccf61
--- /dev/null
+++ b/modules/common/features/laptop.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+  flake.nixosModules.commonFeatureLaptop = { ... }: {
+    services.upower.enable = true;
+    services.logind.settings.Login.HandlePowerKey = "ignore";
+    services.automatic-timezoned.enable = true;
+  };
+}
diff --git a/modules/koon/host/max/configuration.nix b/modules/koon/host/max/configuration.nix
index 6824d5a..84fd4c4 100644
--- a/modules/koon/host/max/configuration.nix
+++ b/modules/koon/host/max/configuration.nix
@@ -5,6 +5,8 @@
 
       self.nixosModules.commonUnstablePkgsOverlay
 
+      self.nixosModules.commonFeatureLaptop
+
       self.nixosModules.commonFeatureEmail
       self.nixosModules.commonFeatureFont
       self.nixosModules.commonFeatureLocale
@@ -39,9 +41,6 @@
       };
     };
 
-    services.upower.enable = true;
-    services.logind.settings.Login.HandlePowerKey = "ignore";
-
     networking.networkmanager = {
       enable = true;
       plugins = with pkgs; [
@@ -143,8 +142,6 @@
       enableSSHSupport = true;
     };
 
-
-    time.timeZone = "America/New_York";
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
     system.stateVersion = "25.05";