diff --git a/hosts/lithium/state.nix b/hosts/lithium/state.nix
index 5a1d266..3fd06a1 100644
--- a/hosts/lithium/state.nix
+++ b/hosts/lithium/state.nix
@@ -38,8 +38,6 @@
     ];
   };
 
-  swapDevices = [ ];
-
   networking.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
diff --git a/hosts/siit-dc/configuration.nix b/hosts/siit-dc/configuration.nix
index 40ca9b0..3471cbe 100644
--- a/hosts/siit-dc/configuration.nix
+++ b/hosts/siit-dc/configuration.nix
@@ -1,12 +1,8 @@
 { ... }:
 {
-  networking.hostName = "siit-dc";
-
   imports = [
     ../../shared/base.nix
+    ../../shared/hardware/vm.nix
     ../../servers/siit-dc.nix
   ];
-
-  # HARDWARE SPECIFIC
-  services.qemuGuest.enable = true;
 }
diff --git a/hosts/siit-dc/state.nix b/hosts/siit-dc/state.nix
new file mode 100644
index 0000000..00c45f5
--- /dev/null
+++ b/hosts/siit-dc/state.nix
@@ -0,0 +1,39 @@
+{ lib, modulesPath, ... }:
+{
+  system.stateVersion = "24.05";
+
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
+  boot.initrd.availableKernelModules = [
+    "uhci_hcd"
+    "ehci_pci"
+    "ahci"
+    "virtio_pci"
+    "virtio_scsi"
+    "sd_mod"
+    "sr_mod"
+  ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/81dc35b1-5a34-4924-b864-b53e5ca9df24";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/D171-033F";
+    fsType = "vfat";
+    options = [
+      "fmask=0077"
+      "dmask=0077"
+    ];
+  };
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
diff --git a/personal/hardware/hibernate.nix b/personal/hardware/hibernate.nix
index 45375f3..e79a68e 100644
--- a/personal/hardware/hibernate.nix
+++ b/personal/hardware/hibernate.nix
@@ -1,6 +1,6 @@
 { lib, ... }:
 {
-  swapDevices = lib.mkForce [
+  swapDevices = [
     {
       device = "/var/lib/swapfile";
       size = 16 * 1024;
diff --git a/shared/base.nix b/shared/base.nix
index aa05e28..0b98c8c 100644
--- a/shared/base.nix
+++ b/shared/base.nix
@@ -124,12 +124,6 @@
 
     ######################################## Memory management ######################################
     zramSwap.enable = true;
-    swapDevices = [
-      {
-        device = "/var/lib/swapfile";
-        size = 8 * 1024;
-      }
-    ];
 
     ######################################## Housekeeping ###########################################
     system.autoUpgrade = {
diff --git a/shared/hardware/vm.nix b/shared/hardware/vm.nix
new file mode 100644
index 0000000..a38cdf0
--- /dev/null
+++ b/shared/hardware/vm.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  swapDevices = [
+    {
+      device = "/var/lib/swapfile";
+      size = 2 * 1024;
+    }
+  ];
+
+  services.qemuGuest.enable = true;
+}