diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..9fb0636
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,16 @@
+{
+  description = "All system configurations for Vili Sinervä";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05";
+  };
+
+  outputs =
+    { nixpkgs }:
+    {
+      nixosConfigurations.lithium = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [ ./hosts/lithium.nix ];
+      };
+    };
+}
diff --git a/machine-confs/lithium.nix b/machine-confs/lithium.nix
index dbc2617..09d08f2 100644
--- a/machine-confs/lithium.nix
+++ b/machine-confs/lithium.nix
@@ -1,8 +1,9 @@
 { lib, ... }:
 {
+  system.stateVersion = 24.05;
   networking.hostName = "lithium";
-  custom.home_wg_suffix = "3";
 
+  custom.home_wg_suffix = "3";
   system.autoUpgrade.allowReboot = lib.mkForce false;
   # boot.kernelParams = [ "resume_offset=39292928" ];
 
diff --git a/shared/base.nix b/shared/base.nix
index d3f4bf1..b9c1beb 100644
--- a/shared/base.nix
+++ b/shared/base.nix
@@ -1,5 +1,7 @@
 { pkgs, lib, ... }:
 {
+  imports = [ /etc/nixos/hardware-configuration.nix ];
+
   options.custom.gua_pref = lib.mkOption {
     type = with lib.types; nullOr (strMatching "^[0-9a-zA-Z:]+$");
     default = null;