diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index c610816..dfd748a 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -33,6 +33,12 @@
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
 
+	# Enable the pipewire sound server
+	services.pipewire = {
+		enable = true;
+		pulse.enable = true;
+	};
+
 	# Configure keymap in X11
 	# services.xserver.layout = "us";
 	# services.xserver.xkbOptions = "eurosign:e,caps:escape";
diff --git a/machines/SteamDeck/configuration.nix b/machines/SteamDeck/configuration.nix
index ea49bd9..db30aa7 100755
--- a/machines/SteamDeck/configuration.nix
+++ b/machines/SteamDeck/configuration.nix
@@ -34,6 +34,12 @@
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
 
+	# Enable the pipewire sound server
+	services.pipewire = {
+		enable = true;
+		pulse.enable = true;
+	};
+
 	jovian = {
 		devices.steamdeck = {
 			enable = true;
diff --git a/machines/SurfaceGo/configuration.nix b/machines/SurfaceGo/configuration.nix
index 990d7a5..1c30fd3 100644
--- a/machines/SurfaceGo/configuration.nix
+++ b/machines/SurfaceGo/configuration.nix
@@ -32,6 +32,12 @@
 
 	# Enable the X11 windowing system.
 	services.xserver.enable = true;
+  
+	# Enable the pipewire sound server
+	services.pipewire = {
+		enable = true;
+		pulse.enable = true;
+	};
 
 	# Configure keymap in X11
 	# services.xserver.layout = "us";
diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix
index 690505c..6393486 100644
--- a/roles/desktop/services/default.nix
+++ b/roles/desktop/services/default.nix
@@ -5,6 +5,5 @@
 		./ssh-agent.nix
 		./flatpak.nix
 		./syncthing.nix
-		./pipewire.nix
 	];
 }
diff --git a/roles/desktop/services/pipewire.nix b/roles/desktop/services/pipewire.nix
deleted file mode 100644
index d064adb..0000000
--- a/roles/desktop/services/pipewire.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ config, ... }:
-
-{
-	services.pipewire = {
-		enable = true;
-		pulse.enable = true;
-	};
-
-	# This allows pipewire to get realtime priority, which (hopefully) gets rid of stutters
-	security.rtkit.enable = true;
-}
diff --git a/roles/gaming/rpcs3.nix b/roles/gaming/rpcs3.nix
index 931b7ba..43b80d0 100644
--- a/roles/gaming/rpcs3.nix
+++ b/roles/gaming/rpcs3.nix
@@ -2,12 +2,4 @@
 
 {
 	environment.systemPackages = with pkgs; [ rpcs3 ];
-
-	# Increase the memory lock limit
-	security.pam.loginLimits = [{
-		domain = "*";
-		item = "memlock";
-		type = "-"; # Applies to both hard and soft limits
-		value = "unlimited";
-	}];
 }