 			}
 		}
 
-		if let uid = UserDefaults.standard.object(forKey: "deviceUID") as? String, let device = try? AudioDevice.makeDevice(forUID: uid) {
-			try? player.setOutputDevice(device)
+		if let uid = UserDefaults.standard.object(forKey: "deviceUID") as? String, let deviceID = try? AudioSystemObject.instance.deviceID(forUID: uid) {
+			try? player.setOutputDeviceID(deviceID)
 		}
 
 		updateDeviceMenu()

			return
		}

		try? player.setOutputDevice(device)
	}

	// MARK: - Player Control

	func windowWillClose(_ notification: Notification) {
		player.stop()

		if let uid = try? getAudioObjectProperty(PropertyAddress(kAudioDevicePropertyDeviceUID), from: player.outputDeviceID, type: CFString.self) as String {
			UserDefaults.standard.set(uid, forKey: "deviceUID")
		}

