diff --git a/Cargo.lock b/Cargo.lock
index 8fbbba3..87ddb62 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -324,7 +324,7 @@ dependencies = [
  "gtk4",
  "lazy_static",
  "libadwaita",
- "libmonado-rs",
+ "libmonado",
  "nix",
  "openxr",
  "relm4",
@@ -1155,9 +1155,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "libmonado-rs"
-version = "0.1.0"
-source = "git+https://github.com/technobaboo/libmonado-rs?rev=6edb1163627d87db9904c57d7ed9dd4dcc7228b7#6edb1163627d87db9904c57d7ed9dd4dcc7228b7"
+name = "libmonado"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3978b97bed5d012afccb11af3bcc5ccff35f313ed978116d3dd6ec3eae4d810b"
 dependencies = [
  "bindgen",
  "cmake",
diff --git a/Cargo.toml b/Cargo.toml
index 7dac8fb..759b87f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ git2 = "0.19.0"
 gtk = { package = "gtk4", version = "0.9.0", features = ["v4_10"] }
 lazy_static = "1.5.0"
 adw = { package = "libadwaita", version = "0.7.0", features = ["v1_5"] }
-libmonado-rs = { git = "https://github.com/technobaboo/libmonado-rs", rev = "6edb1163627d87db9904c57d7ed9dd4dcc7228b7" }
+libmonado = "1.3.0"
 rusb = "0.9.4"
 nix = { version = "0.29.0", features = ["fs", "signal"] }
 relm4 = { version = "0.9.0", features = ["libadwaita"] }
diff --git a/src/ui/app.rs b/src/ui/app.rs
index d02b8f3..7b63138 100644
--- a/src/ui/app.rs
+++ b/src/ui/app.rs
@@ -79,7 +79,7 @@ pub struct App {
     build_worker: Option<JobWorker>,
     profiles: Vec<Profile>,
     xr_devices: Vec<XRDevice>,
-    libmonado: Option<libmonado_rs::Monado>,
+    libmonado: Option<libmonado::Monado>,
 
     wivrn_conf_editor: Option<Controller<WivrnConfEditor>>,
     skip_depcheck: bool,
@@ -375,7 +375,7 @@ impl AsyncComponent for App {
                             .sender()
                             .emit(MainViewMsg::UpdateDevices(self.xr_devices.clone()));
                     } else if let Some(so) = self.get_selected_profile().libmonado_so() {
-                        self.libmonado = libmonado_rs::Monado::create(so).ok();
+                        self.libmonado = libmonado::Monado::create(so).ok();
                         if self.libmonado.is_some() {
                             sender.input(Msg::ClockTicking);
                         }
diff --git a/src/ui/battery_status.rs b/src/ui/battery_status.rs
index e6ff861..6f83c01 100644
--- a/src/ui/battery_status.rs
+++ b/src/ui/battery_status.rs
@@ -1,4 +1,4 @@
-use libmonado_rs::BatteryStatus;
+use libmonado::BatteryStatus;
 use std::fmt::Display;
 
 #[derive(Debug, Clone)]
diff --git a/src/xr_devices.rs b/src/xr_devices.rs
index 24636a2..ddd2b35 100644
--- a/src/xr_devices.rs
+++ b/src/xr_devices.rs
@@ -1,4 +1,4 @@
-use libmonado_rs::{self, BatteryStatus, DeviceRole};
+use libmonado::{self, BatteryStatus, DeviceRole};
 use std::{collections::HashMap, fmt::Display, slice::Iter};
 
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
@@ -241,7 +241,7 @@ pub struct XRDevice {
 }
 
 impl XRDevice {
-    pub fn from_libmonado(monado: &libmonado_rs::Monado) -> Vec<Self> {
+    pub fn from_libmonado(monado: &libmonado::Monado) -> Vec<Self> {
         if let Ok(monado_devs) = monado.devices() {
             let mut devs: HashMap<u32, XRDevice> = monado_devs
                 .into_iter()
@@ -249,7 +249,7 @@ impl XRDevice {
                     (
                         dev.index,
                         Self {
-                            id: dev.id,
+                            id: dev.name_id,
                             index: dev.index,
                             serial: dev.serial().ok(),
                             battery: dev.battery_status().ok().and_then(|bs| {