diff --git a/crates/radicle-cli/src/commands/watch.rs b/crates/radicle-cli/src/commands/watch.rs
index e1dfb06b..b0c73a20 100644
--- a/crates/radicle-cli/src/commands/watch.rs
+++ b/crates/radicle-cli/src/commands/watch.rs
@@ -42,7 +42,7 @@ pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
             thread::sleep(interval);
             let oid = reference(&repo, &nid, &qualified)?;
             if oid != initial {
-                term::info!("{}", oid.unwrap_or(git::raw::Oid::zero().into()));
+                term::info!("{}", oid.unwrap_or(git::Oid::ZERO_SHA1));
                 break;
             }
             if now.elapsed()? >= timeout {
diff --git a/crates/radicle-fetch/src/git/mem.rs b/crates/radicle-fetch/src/git/mem.rs
index c7715c4c..c0e10019 100644
--- a/crates/radicle-fetch/src/git/mem.rs
+++ b/crates/radicle-fetch/src/git/mem.rs
@@ -42,10 +42,10 @@ impl Refdb {
             .fold(Applied::default(), |mut ap, update| match update {
                 Update::Direct { name, target, .. } => {
                     let name = name.into_qualified().into_owned();
-                    let prev = match self.0.insert(name.clone(), target) {
-                        Some(prev) => prev,
-                        None => radicle::git::raw::Oid::zero().into(),
-                    };
+                    let prev = self
+                        .0
+                        .insert(name.clone(), target)
+                        .unwrap_or(radicle::git::Oid::ZERO_SHA1);
                     ap.updated.push(RefUpdate::Updated {
                         name: name.to_ref_string(),
                         old: prev,
diff --git a/crates/radicle-protocol/src/service/message.rs b/crates/radicle-protocol/src/service/message.rs
index 74d7f243..c78bb2a9 100644
--- a/crates/radicle-protocol/src/service/message.rs
+++ b/crates/radicle-protocol/src/service/message.rs
@@ -690,7 +690,6 @@ mod tests {
     use fastrand;
     use localtime::LocalTime;
     use qcheck_macros::quickcheck;
-    use radicle::git::raw;
     use radicle::test::arbitrary;
 
     use crate::wire::Decode as _;
@@ -701,7 +700,7 @@ mod tests {
     fn test_ref_remote_limit() {
         let mut refs = BoundedVec::<_, REF_REMOTE_LIMIT>::new();
         let signer = Device::mock();
-        let at = raw::Oid::zero().into();
+        let at = git::Oid::ZERO_SHA1;
 
         assert_eq!(refs.capacity(), REF_REMOTE_LIMIT);
 
@@ -759,7 +758,7 @@ mod tests {
     fn prop_refs_announcement_signing(rid: RepoId) {
         let signer = Device::mock_rng(&mut fastrand::Rng::new());
         let timestamp = Timestamp::EPOCH;
-        let at = raw::Oid::zero().into();
+        let at = git::Oid::ZERO_SHA1;
         let refs = BoundedVec::collect_from(
             &mut [RefsAt {
                 remote: *signer.public_key(),
diff --git a/crates/radicle/src/node/notifications/store.rs b/crates/radicle/src/node/notifications/store.rs
index e2702e6e..cda11342 100644
--- a/crates/radicle/src/node/notifications/store.rs
+++ b/crates/radicle/src/node/notifications/store.rs
@@ -380,7 +380,7 @@ mod parse {
                     })
                 })
             })
-            .unwrap_or(Ok(git::raw::Oid::zero().into()))?;
+            .unwrap_or(Ok(git::Oid::ZERO_SHA1))?;
         let new = row
             .try_read::<Option<&str>, _>("new")?
             .map(|oid| {
@@ -391,7 +391,7 @@ mod parse {
                     })
                 })
             })
-            .unwrap_or(Ok(git::raw::Oid::zero().into()))?;
+            .unwrap_or(Ok(git::Oid::ZERO_SHA1))?;
         let update = RefUpdate::from(RefString::try_from(refstr)?, old, new);
         let (namespace, qualified) = git::parse_ref(refstr)?;
         let timestamp = row.try_read::<i64, _>("timestamp")?;