diff --git a/hardware/tokishiko.nix b/hardware/tokishiko.nix
index 3c6092d..3972da2 100644
--- a/hardware/tokishiko.nix
+++ b/hardware/tokishiko.nix
@@ -10,11 +10,11 @@
 
   boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "xhci_pci" "firewire_ohci" "usb_storage" "sd_mod" "sr_mod" "sdhci_pci" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/98ff21ae-1adf-469e-8cea-3bd04cc564ab";
+    { device = "/dev/disk/by-uuid/68a22707-e30a-469b-b24b-13fccd128929";
       fsType = "xfs";
     };
 
diff --git a/system/common.nix b/system/common.nix
index 4fb8645..cf25bb0 100644
--- a/system/common.nix
+++ b/system/common.nix
@@ -112,6 +112,12 @@ in
   ];
 
 
+  hardware.bluetooth = {
+    enable = true;
+    settings.General.Enable = "Source,Sink,Media,Socket";
+  };
+
+
   # Xorg
   security.rtkit.enable = true;
   services = {
diff --git a/system/maidena.nix b/system/maidena.nix
index 4fa0618..1c4c22a 100644
--- a/system/maidena.nix
+++ b/system/maidena.nix
@@ -1,11 +1,6 @@
 {
   services.distccd.maxJobs = 4;
 
-  hardware.bluetooth = {
-    enable = true;
-    settings.General.Enable = "Source,Sink,Media,Socket";
-  };
-
   services = {
     desktopManager.plasma6.enable = true;
     displayManager.sddm = {
diff --git a/system/noma.nix b/system/noma.nix
index 481b6f3..121d3a9 100644
--- a/system/noma.nix
+++ b/system/noma.nix
@@ -12,11 +12,6 @@
     };
   };
 
-  hardware.bluetooth = {
-    enable = true;
-    settings.General.Enable = "Source,Sink,Media,Socket";
-  };
-
   services = {
     desktopManager.plasma6.enable = true;
     displayManager.sddm = {