Fixup after rebase

automerge/src/automerge.rs

@@ -308,7 +308,7 @@ impl Automerge {
             Key::Seq(opid) => {
                 let i = self
                     .ops
-                    .search(obj, query::OpIdSearch::new(opid.0))
+                    .search(&obj, query::OpIdSearch::new(opid.0))
                     .index()
                     .unwrap();
                 Prop::Seq(i)

automerge/src/op_set.rs

@@ -164,7 +164,7 @@ impl<'a> Iterator for Iter<'a> {
         let mut result = None;
         for obj in self.objs.iter().skip(self.index) {
             let tree = self.inner.trees.get(obj)?;
-            result = tree.internal.get(self.sub_index);
+            result = tree.internal.get(self.sub_index).map(|op| (*obj, op));
             if result.is_some() {
                 self.sub_index += 1;
                 break;