diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 3efee8e..399bb53 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -64,8 +64,7 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 [[package]]
 name = "automerge"
 version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0b670b68c38e4042ea4826415f0f8101428810bce821d215e271966b24abac4"
+source = "git+https://github.com/automerge/automerge?branch=op_set2#70cae0b4da5ddb48bf6699f50e391eff3a331d06"
 dependencies = [
  "flate2",
  "fxhash",
@@ -73,6 +72,8 @@ dependencies = [
  "im",
  "itertools",
  "leb128",
+ "packer",
+ "rand",
  "serde",
  "sha2",
  "smol_str",
@@ -391,6 +392,15 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
+[[package]]
+name = "packer"
+version = "0.1.0"
+source = "git+https://github.com/automerge/automerge?branch=op_set2#70cae0b4da5ddb48bf6699f50e391eff3a331d06"
+dependencies = [
+ "leb128",
+ "thiserror",
+]
+
 [[package]]
 name = "paste"
 version = "1.0.15"
@@ -409,6 +419,15 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
+[[package]]
+name = "ppv-lite86"
+version = "0.2.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.83"
@@ -427,11 +446,35 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
 [[package]]
 name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
 
 [[package]]
 name = "rand_xoshiro"
@@ -859,3 +902,24 @@ checksum = "998d2c24ec099a87daf9467808859f9d82b61f1d9c9701251aea037f514eae0e"
 dependencies = [
  "nom",
 ]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 7b65eb2..db8096d 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -13,7 +13,8 @@ path = "uniffi-bindgen.rs"
 required-features = ["uniffi/cli"]
 
 [dependencies]
-automerge = "0.5.11"
+# automerge = "0.5.11"
+automerge = { git = "https://github.com/automerge/automerge", branch = "op_set2" }
 thiserror = "1.0.38"
 uniffi = "0.27.1"
 
diff --git a/rust/src/mark.rs b/rust/src/mark.rs
index a039e6d..0b1e9e3 100644
--- a/rust/src/mark.rs
+++ b/rust/src/mark.rs
@@ -27,8 +27,8 @@ pub struct Mark {
     pub value: ScalarValue,
 }
 
-impl<'a> From<&'a am::marks::Mark<'a>> for Mark {
-    fn from(am_mark: &'a am::marks::Mark<'a>) -> Mark {
+impl<'a> From<&'a am::marks::Mark> for Mark {
+    fn from(am_mark: &'a am::marks::Mark) -> Mark {
         Mark {
             start: am_mark.start as u64,
             end: am_mark.end as u64,