diff --git a/include/git2/rebase.h b/include/git2/rebase.h
index b9b0af73b..46fadc67b 100644
--- a/include/git2/rebase.h
+++ b/include/git2/rebase.h
@@ -90,7 +90,7 @@ typedef struct {
 		 * The commit ID being cherry-picked.  This will be populated for
 		 * all operations except those of type `GIT_REBASE_OPERATION_EXEC`.
 		 */
-		git_oid id;
+		const git_oid id;
 
 		/**
 		 * The executable the user has requested be run.  This will only
diff --git a/src/rebase.c b/src/rebase.c
index a4e9bade7..a27ecabc3 100644
--- a/src/rebase.c
+++ b/src/rebase.c
@@ -204,7 +204,7 @@ static int rebase_open_merge(git_rebase *rebase)
 		git_buf_clear(&cmt);
 
 		if ((error = git_buf_printf(&cmt, "cmt.%" PRIuZ, (i+1))) < 0 ||
-			(error = rebase_readoid(&operation->id, &buf, &state_path, cmt.ptr)) < 0)
+			(error = rebase_readoid((git_oid *)&operation->id, &buf, &state_path, cmt.ptr)) < 0)
 			goto done;
 	}
 
@@ -549,7 +549,7 @@ static int rebase_init_operations(
 
 		operation = git_array_alloc(rebase->operations);
 		operation->type = GIT_REBASE_OPERATION_PICK;
-		git_oid_cpy(&operation->id, &id);
+		git_oid_cpy((git_oid *)&operation->id, &id);
 	}
 
 	error = 0;