diff --git a/agb/src/display/object.rs b/agb/src/display/object.rs
index effe2fc2..4a9b0d6f 100644
--- a/agb/src/display/object.rs
+++ b/agb/src/display/object.rs
@@ -232,11 +232,17 @@ impl AffineMatrix<'_> {
     #[allow(clippy::identity_op)]
     /// Commits matrix to OAM, will cause any objects using this matrix to be updated.
     pub fn commit(&self) {
-        let id = self.loan.index as usize * 4;
-        OBJECT_ATTRIBUTE_MEMORY.set((id + 0) * 4 + 3, self.attributes.p_a as u16);
-        OBJECT_ATTRIBUTE_MEMORY.set((id + 1) * 4 + 3, self.attributes.p_b as u16);
-        OBJECT_ATTRIBUTE_MEMORY.set((id + 2) * 4 + 3, self.attributes.p_c as u16);
-        OBJECT_ATTRIBUTE_MEMORY.set((id + 3) * 4 + 3, self.attributes.p_d as u16);
+        unsafe { self.attributes.commit(self.loan.index) };
+    }
+}
+
+impl AffineMatrixAttributes {
+    unsafe fn commit(&self, index: u8) {
+        let index = index as usize * 4;
+        OBJECT_ATTRIBUTE_MEMORY.set((index + 0) * 4 + 3, self.p_a as u16);
+        OBJECT_ATTRIBUTE_MEMORY.set((index + 1) * 4 + 3, self.p_b as u16);
+        OBJECT_ATTRIBUTE_MEMORY.set((index + 2) * 4 + 3, self.p_c as u16);
+        OBJECT_ATTRIBUTE_MEMORY.set((index + 3) * 4 + 3, self.p_d as u16);
     }
 }