diff --git a/hosts/Infini-DESKTOP/default.nix b/hosts/Infini-DESKTOP/default.nix
index 91445ee..6700065 100644
--- a/hosts/Infini-DESKTOP/default.nix
+++ b/hosts/Infini-DESKTOP/default.nix
@@ -11,7 +11,6 @@
       networking.wireless
 
       (with hardware; [
-        sound
         gpu.nvidia
         wireless
       ])
@@ -29,12 +28,18 @@
 
   system.stateVersion = "21.05";
 
+  modules = {
+    hardware = {
+      audio.enable = true;
+    };
+  };
+
   networking.interfaces = {
     eth0.useDHCP = true;
     wlp41s0.useDHCP = true;
   };
 
-  home-manager.users.infinidoge = { profiles, ... }: {
+  home = { profiles, ... }: {
     imports = with profiles; [ stretchly ];
   };
 
diff --git a/hosts/Infini-FRAMEWORK/default.nix b/hosts/Infini-FRAMEWORK/default.nix
index 90e2a31..06df46c 100644
--- a/hosts/Infini-FRAMEWORK/default.nix
+++ b/hosts/Infini-FRAMEWORK/default.nix
@@ -8,7 +8,6 @@
       networking.wireless
 
       (with hardware; [
-        sound
         laptop
         gpu.intel
         wireless
@@ -46,6 +45,12 @@
     ];
   };
 
+  modules = {
+    hardware = {
+      audio.enable = true;
+    };
+  };
+
   networking.interfaces.wlp170s0.useDHCP = true;
 
   hardware.video.hidpi.enable = false;
diff --git a/hosts/Infini-SWIFT/default.nix b/hosts/Infini-SWIFT/default.nix
index 00a3bc6..0dd5c19 100644
--- a/hosts/Infini-SWIFT/default.nix
+++ b/hosts/Infini-SWIFT/default.nix
@@ -9,7 +9,6 @@
         networking.wireless
 
         (with hardware; [
-          sound
           gpu.amdgpu
           laptop
           wireless
@@ -26,6 +25,12 @@
 
   powerManagement.resumeCommands = "${pkgs.kmod}/bin/rmod atkbd; ${pkgs.kmod}/bin/modprobe atkbd reset=1";
 
+  modules = {
+    hardware = {
+      audio.enable = true;
+    };
+  };
+
   networking.interfaces.wlan0.useDHCP = true;
 
 
diff --git a/profiles/hardware/sound.nix b/profiles/hardware/sound.nix
deleted file mode 100644
index 61771d2..0000000
--- a/profiles/hardware/sound.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }: {
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-}