diff --git a/flake.nix b/flake.nix
index f30411fb..85b24866 100644
--- a/flake.nix
+++ b/flake.nix
@@ -56,7 +56,9 @@
               lib,
               pkgs,
               ...
-            }: {
+            }: let
+              flakeURL = "https://git.xenia.me.uk/xenia/nixos.git?ref=main";
+            in {
               boot.loader = {
                 systemd-boot.enable = true;
                 efi.canTouchEfiVariables = true;
@@ -90,7 +92,7 @@
                     };
                     to = {
                       type = "git";
-                      url = "https://git.xenia.me.uk/xenia/nixos.git?ref=main";
+                      url = flakeURL;
                     };
                   };
                   pyenv = {
@@ -127,7 +129,13 @@
                 '';
               };
               nixpkgs.config.allowUnfree = true;
-              system = {inherit stateVersion;};
+              system = {
+                inherit stateVersion;
+                autoUpgrade = {
+                  enable = true;
+                  flake = "git+${flakeURL}";
+                };
+              };
               networking = {
                 inherit hostName;
                 firewall.enable = true;
diff --git a/hosts/Legion/configuration.nix b/hosts/Legion/configuration.nix
index 3da927b0..1f1d3f89 100644
--- a/hosts/Legion/configuration.nix
+++ b/hosts/Legion/configuration.nix
@@ -1,8 +1,6 @@
 {...}: {
   users.mutableUsers = false;
   system.autoUpgrade = {
-    enable = true;
-    flake = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
     dates = "02:30";
     allowReboot = true;
     rebootWindow = {