diff --git a/nix/config.nix b/nix/config.nix
index ea87ee40..33d44a4a 100644
--- a/nix/config.nix
+++ b/nix/config.nix
@@ -39,85 +39,31 @@ in
       default = "nix_2_18";
     };
 
-    home = {
-      modules = lib.mkOption {
-        type = with lib.types; listOf deferredModule;
-        default = [ ];
-        description = ''
-          Default list of modules to include when generating Home Manager
-          configuration with `lib.mkHome` and `lib.importHome`.
-        '';
-      };
-
-      stateVersion = lib.mkOption {
-        type = lib.types.str;
-        default = nixosRelease;
-        description = ''
-          The default `stateVersion` to use for Home Manager.
-
-          More info is available at
-          <https://nix-community.github.io/home-manager/options.html#opt-home.stateVersion>.
-
-          ::: {.warning}
-          Make sure to understand what the following does. It's strongly
-          recommended to override this option this per host.
-          :::
-        '';
-      };
+    home.modules = lib.mkOption {
+      type = with lib.types; listOf deferredModule;
+      default = [ ];
+      description = ''
+        Default list of modules to include when generating Home Manager
+        configuration with `lib.mkHome` and `lib.importHome`.
+      '';
     };
 
-    nixos = {
-      modules = lib.mkOption {
-        type = with lib.types; listOf deferredModule;
-        default = [ ];
-        description = ''
-          Default list of modules to include when generating NixOS configuration
-          with `lib.mkNixOS` and `lib.importNixOS`.
-        '';
-      };
-
-      stateVersion = lib.mkOption {
-        type = lib.types.str;
-        default = nixosRelease;
-        description = ''
-          The default `stateVersion` to use for NixOS.
-
-          More info is available at
-          <https://search.nixos.org/options?show=system.stateVersion>.
-
-          ::: {.warning}
-          Make sure to understand what the following does. It's strongly
-          recommended to override this option this per host.
-          :::
-        '';
-      };
+    nixos.modules = lib.mkOption {
+      type = with lib.types; listOf deferredModule;
+      default = [ ];
+      description = ''
+        Default list of modules to include when generating NixOS configuration
+        with `lib.mkNixOS` and `lib.importNixOS`.
+      '';
     };
 
-    darwin = {
-      modules = lib.mkOption {
-        type = with lib.types; listOf deferredModule;
-        default = [ ];
-        description = ''
-          Default list of modules to include when generating nix-darwin
-          configuration with `lib.mkDarwin` and `lib.importDarwin`.
-        '';
-      };
-
-      stateVersion = lib.mkOption {
-        type = lib.types.ints.positive;
-        default = 4;
-        description = ''
-          The default `stateVersion` to use for nix-darwin.
-
-          More info is available at
-          <https://daiderd.com/nix-darwin/manual/index.html#opt-system.stateVersion>.
-
-          ::: {.warning}
-          Make sure to understand what the following does. It's strongly
-          recommended to override this option this per host.
-          :::
-        '';
-      };
+    darwin.modules = lib.mkOption {
+      type = with lib.types; listOf deferredModule;
+      default = [ ];
+      description = ''
+        Default list of modules to include when generating nix-darwin
+        configuration with `lib.mkDarwin` and `lib.importDarwin`.
+      '';
     };
   };
 }
diff --git a/nix/darwin/default.nix b/nix/darwin/default.nix
index 39a69d48..ded64020 100644
--- a/nix/darwin/default.nix
+++ b/nix/darwin/default.nix
@@ -8,7 +8,6 @@
       ./modules/setup.nix
       ./modules/nix.nix
       ./modules/shell.nix
-      ./profiles/common.nix
       ./profiles/apps.nix
     ];
 
diff --git a/nix/darwin/machines/ci.nix b/nix/darwin/machines/ci.nix
index 81cccedc..31db6d2c 100644
--- a/nix/darwin/machines/ci.nix
+++ b/nix/darwin/machines/ci.nix
@@ -13,5 +13,8 @@ in
       enableAll = true;
       extras.enable = false;
     };
+    home.stateVersion = "23.11";
   };
+
+  system.stateVersion = 4;
 }
diff --git a/nix/darwin/profiles/common.nix b/nix/darwin/profiles/common.nix
deleted file mode 100644
index ddf09724..00000000
--- a/nix/darwin/profiles/common.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ lib, config, ... }:
-
-let
-  inherit (config.dotfiles) flakeOptions;
-in
-{
-  system.stateVersion = lib.mkDefault flakeOptions.darwin.stateVersion;
-}
diff --git a/nix/home/machines/ci.nix b/nix/home/machines/ci.nix
index 0c6ac738..1634d903 100644
--- a/nix/home/machines/ci.nix
+++ b/nix/home/machines/ci.nix
@@ -1,4 +1,5 @@
 {
   dotfiles.profiles.enableAll = true;
   programs.home-manager.enable = true;
+  home.stateVersion = "23.11";
 }
diff --git a/nix/home/profiles/common.nix b/nix/home/profiles/common.nix
deleted file mode 100644
index 37233da1..00000000
--- a/nix/home/profiles/common.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ lib, config, ... }:
-
-let
-  inherit (config.dotfiles) flakeOptions;
-in
-{
-  config.home.stateVersion = lib.mkDefault flakeOptions.home.stateVersion;
-}
diff --git a/nix/home/profiles/default.nix b/nix/home/profiles/default.nix
index 11cf80f6..7a497d6e 100644
--- a/nix/home/profiles/default.nix
+++ b/nix/home/profiles/default.nix
@@ -2,7 +2,6 @@
 
 {
   imports = [
-    ./common.nix
     ./minimal.nix
     ./essential.nix
     ./extras.nix
diff --git a/nix/nixos/machines/ci.nix b/nix/nixos/machines/ci.nix
index b1e628dd..7039efa3 100644
--- a/nix/nixos/machines/ci.nix
+++ b/nix/nixos/machines/ci.nix
@@ -15,4 +15,6 @@ in
   };
 
   users.users.${username}.password = "";
+
+  system.stateVersion = "23.11";
 }
diff --git a/nix/nixos/profiles/common.nix b/nix/nixos/profiles/common.nix
index 0bcaccc1..315a80c7 100644
--- a/nix/nixos/profiles/common.nix
+++ b/nix/nixos/profiles/common.nix
@@ -16,7 +16,5 @@ in
     nix.extraOptions = ''
       experimental-features = nix-command flakes
     '';
-
-    system.stateVersion = lib.mkDefault flakeOptions.nixos.stateVersion;
   };
 }
diff --git a/nix/templates/darwin/flake.nix b/nix/templates/darwin/flake.nix
index 7ea0869d..cc018f70 100644
--- a/nix/templates/darwin/flake.nix
+++ b/nix/templates/darwin/flake.nix
@@ -32,7 +32,7 @@
             # Options are defined in:
             # https://github.com/midchildan/dotfiles/blob/nix/home
             dotfiles.profiles.enableAll = true;
-            home.stateVersion = "23.05";
+            home.stateVersion = "23.11";
           };
         }];
       };
diff --git a/nix/templates/home/flake.nix b/nix/templates/home/flake.nix
index e5fe809f..375ecc46 100644
--- a/nix/templates/home/flake.nix
+++ b/nix/templates/home/flake.nix
@@ -27,7 +27,7 @@
             # Options are defined in:
             # https://github.com/midchildan/dotfiles/blob/nix/home
             dotfiles.profiles.enableAll = true;
-            home.stateVersion = "23.05";
+            home.stateVersion = "23.11";
           }];
         };
       };
diff --git a/nix/templates/nixos/flake.nix b/nix/templates/nixos/flake.nix
index a59c26a0..98deb9f6 100644
--- a/nix/templates/nixos/flake.nix
+++ b/nix/templates/nixos/flake.nix
@@ -31,7 +31,7 @@
             network.enable = true;
             desktop.enable = true;
           };
-          system.stateVersion = "23.05";
+          system.stateVersion = "23.11";
         }];
       };
     });