diff --git a/machines/Archie/configuration.nix b/machines/Archie/configuration.nix
index dfd748a..c610816 100644
--- a/machines/Archie/configuration.nix
+++ b/machines/Archie/configuration.nix
@@ -33,12 +33,6 @@
 	# 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 db30aa7..ea49bd9 100755
--- a/machines/SteamDeck/configuration.nix
+++ b/machines/SteamDeck/configuration.nix
@@ -34,12 +34,6 @@
 	# 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 1c30fd3..990d7a5 100644
--- a/machines/SurfaceGo/configuration.nix
+++ b/machines/SurfaceGo/configuration.nix
@@ -32,12 +32,6 @@
 
 	# 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 6393486..690505c 100644
--- a/roles/desktop/services/default.nix
+++ b/roles/desktop/services/default.nix
@@ -5,5 +5,6 @@
 		./ssh-agent.nix
 		./flatpak.nix
 		./syncthing.nix
+		./pipewire.nix
 	];
 }
diff --git a/roles/desktop/services/pipewire.nix b/roles/desktop/services/pipewire.nix
new file mode 100644
index 0000000..d064adb
--- /dev/null
+++ b/roles/desktop/services/pipewire.nix
@@ -0,0 +1,11 @@
+{ 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 43b80d0..931b7ba 100644
--- a/roles/gaming/rpcs3.nix
+++ b/roles/gaming/rpcs3.nix
@@ -2,4 +2,12 @@
 
 {
 	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";
+	}];
 }