diff --git a/common/system/desktop.nix b/common/system/desktop.nix
index bcba6fe..f5c6d0c 100644
--- a/common/system/desktop.nix
+++ b/common/system/desktop.nix
@@ -12,7 +12,7 @@
     ./features/flatpak.nix
     ./features/fonts.nix
     ./features/fwupd.nix
-    ./features/geoclue.nix
+    ./features/location.nix
     ./features/mullvad.nix
     ./features/opengl.nix
     ./features/openssh.nix
@@ -111,7 +111,6 @@
   networking.networkmanager.enable = true;
   users.users.lukas.extraGroups = ["networkmanager"];
 
-  time.timeZone = lib.mkDefault "Europe/Berlin";
   i18n.defaultLocale = lib.mkDefault "en_US.UTF-8";
   console.keyMap = lib.mkDefault "us";
   services.xserver.layout = lib.mkDefault "us";
diff --git a/common/system/features/geoclue.nix b/common/system/features/geoclue.nix
deleted file mode 100644
index ce62f46..0000000
--- a/common/system/features/geoclue.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  services.geoclue2.enable = true;
-}
diff --git a/common/system/features/location.nix b/common/system/features/location.nix
new file mode 100644
index 0000000..e26b187
--- /dev/null
+++ b/common/system/features/location.nix
@@ -0,0 +1,5 @@
+{lib, ...}: {
+  location.provider = "geoclue2";
+  services.automatic-timezoned.enable = true;
+  services.geoclue2.enableDemoAgent = lib.mkForce true;
+}
diff --git a/flake.lock b/flake.lock
index 0843115..34ef199 100644
--- a/flake.lock
+++ b/flake.lock
@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696446489,
-        "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=",
+        "lastModified": 1696737557,
+        "narHash": "sha256-YD/pjDjj/BNmisEvRdM/vspkCU3xyyeGVAUWhvVSi5Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a",
+        "rev": "3c1d8758ac3f55ab96dcaf4d271c39da4b6e836d",
         "type": "github"
       },
       "original": {
@@ -52,11 +52,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696375444,
-        "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
+        "lastModified": 1696604326,
+        "narHash": "sha256-YXUNI0kLEcI5g8lqGMb0nh67fY9f2YoJsILafh6zlMo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
+        "rev": "87828a0e03d1418e848d3dd3f3014a632e4a4f64",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1696123266,
-        "narHash": "sha256-S6MZEneQeE4M/E/C8SMnr7B7oBnjH/hbm96Kak5hAAI=",
+        "lastModified": 1696717752,
+        "narHash": "sha256-qEq1styCyQHSrw7AOhskH2qwCFx93bOwsGEzUIrZC0g=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dbe90e63a36762f1fbde546e26a84af774a32455",
+        "rev": "2f3b6b3fcd9fa0a4e6b544180c058a70890a7cc1",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1695978539,
-        "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=",
+        "lastModified": 1696693680,
+        "narHash": "sha256-PH0HQTkqyj7DmdPKPwrrXwVURLBqzZs4nqnDw9q8mhg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8",
+        "rev": "945559664c1dc5836173ee12896ba421d9b37181",
         "type": "github"
       },
       "original": {
@@ -113,11 +113,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1696320910,
-        "narHash": "sha256-fbuEc6wylH+0VxG48lhPBK+SQJHfo2lusUwWHZNipIM=",
+        "lastModified": 1696734395,
+        "narHash": "sha256-O/g/wwBqqSS7RQ53bE6Ssf0pXVTCYfN7NnJDhKfggQY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "746c7fa1a64c1671a4bf287737c27fdc7101c4c2",
+        "rev": "d7380c38d407eaf06d111832f4368ba3486b800e",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5bcc2e1..22aa626 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,7 +96,7 @@
               (./common/system + "/${class}.nix")
 
               home-manager.nixosModules.home-manager
-    (impermanence + "/nixos.nix")
+              (impermanence + "/nixos.nix")
               (sops-nix + "/modules/sops")
             ];
         });