diff --git a/crates/carddav/src/address_object/methods.rs b/crates/carddav/src/address_object/methods.rs
index a28aeb6..896f1ab 100644
--- a/crates/carddav/src/address_object/methods.rs
+++ b/crates/carddav/src/address_object/methods.rs
@@ -86,7 +86,8 @@ pub async fn put_object<AS: AddressbookStore>(
         true
     };
 
-    let object = AddressObject::from_vcf(object_id, body)?;
+    let object = AddressObject::from_vcf(body)?;
+    assert_eq!(object.get_id(), object_id);
     addr_store
         .put_object(principal, addressbook_id, object, overwrite)
         .await?;
diff --git a/crates/ical/src/address_object.rs b/crates/ical/src/address_object.rs
index 6e6d3c5..c4c389c 100644
--- a/crates/ical/src/address_object.rs
+++ b/crates/ical/src/address_object.rs
@@ -11,7 +11,6 @@ use std::{collections::HashMap, io::BufReader};
 
 #[derive(Debug, Clone)]
 pub struct AddressObject {
-    id: String,
     vcf: String,
     vcard: VcardContact,
 }
@@ -20,19 +19,16 @@ impl TryFrom<VcardContact> for AddressObject {
     type Error = Error;
 
     fn try_from(vcard: VcardContact) -> Result<Self, Self::Error> {
-        let id = vcard
-            .get_property("UID")
-            .ok_or(Error::InvalidData("Missing UID".to_owned()))?
-            .value
-            .clone()
-            .ok_or(Error::InvalidData("Missing UID".to_owned()))?;
+        if vcard.get_uid().is_none() {
+            return Err(Error::InvalidData("missing UID".to_owned()));
+        }
         let vcf = vcard.generate();
-        Ok(Self { id, vcf, vcard })
+        Ok(Self { vcf, vcard })
     }
 }
 
 impl AddressObject {
-    pub fn from_vcf(object_id: String, vcf: String) -> Result<Self, Error> {
+    pub fn from_vcf(vcf: String) -> Result<Self, Error> {
         let mut parser = vcard::VcardParser::new(BufReader::new(vcf.as_bytes()));
         let vcard = parser.next().ok_or(Error::MissingContact)??;
         if parser.next().is_some() {
@@ -40,20 +36,22 @@ impl AddressObject {
                 "multiple vcards, only one allowed".to_owned(),
             ));
         }
-        Ok(Self {
-            id: object_id,
-            vcf,
-            vcard,
-        })
+
+        if vcard.get_uid().is_none() {
+            return Err(Error::InvalidData("missing UID".to_owned()));
+        }
+        Ok(Self { vcf, vcard })
     }
 
     pub fn get_id(&self) -> &str {
-        &self.id
+        self.vcard
+            .get_uid()
+            .expect("We've validated before that UID exists")
     }
 
     pub fn get_etag(&self) -> String {
         let mut hasher = Sha256::new();
-        hasher.update(&self.id);
+        hasher.update(self.get_id());
         hasher.update(self.get_vcf());
         format!("\"{:x}\"", hasher.finalize())
     }