diff --git a/mpris2/src/playlists/id.rs b/mpris2/src/playlists/id.rs
index fb45cae..23b38d5 100644
--- a/mpris2/src/playlists/id.rs
+++ b/mpris2/src/playlists/id.rs
@@ -36,7 +36,7 @@ impl<'a> AsRef<ObjectPath<'a>> for PlaylistId {
 
 impl PartialOrd for PlaylistId {
 	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		self.0.as_str().partial_cmp(other.0.as_str())
+		Some(self.cmp(other))
 	}
 }
 
diff --git a/mpris2/src/track.rs b/mpris2/src/track.rs
index b107510..1f4f0c4 100644
--- a/mpris2/src/track.rs
+++ b/mpris2/src/track.rs
@@ -37,7 +37,7 @@ impl<'a> AsRef<ObjectPath<'a>> for TrackId {
 
 impl PartialOrd for TrackId {
 	fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
-		self.0.as_str().partial_cmp(other.0.as_str())
+		Some(self.cmp(other))
 	}
 }
 
diff --git a/mpris2/src/track_list.rs b/mpris2/src/track_list.rs
index 0dcd638..f9b20f6 100644
--- a/mpris2/src/track_list.rs
+++ b/mpris2/src/track_list.rs
@@ -65,7 +65,7 @@ impl TrackList {
 		self.proxy
 			.tracks()
 			.await
-			.map(|x| x.into_iter().map(TrackId::from).collect())
+			.map(|x| x.into_iter().collect())
 			.map_err(Error::from)
 	}