diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
index c3d6233..37cb344 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewersbyblame/ChangeUpdatedListener.java
@@ -103,7 +103,7 @@
 
     try (Repository git = repoManager.openRepository(projectName);
         RevWalk rw = new RevWalk(git)) {
-      Change.Id changeId = new Change.Id(e.change.get().number);
+      Change.Id changeId = Change.id(e.change.get().number);
       final ChangeData cd = changeDataFactory.create(projectName, changeId);
       if (cd == null) {
         log.warn(
@@ -113,7 +113,7 @@
         return;
       }
       final Change change = cd.change();
-      PatchSet.Id psId = new PatchSet.Id(changeId, e.patchSet.get().number);
+      PatchSet.Id psId = PatchSet.id(changeId, e.patchSet.get().number);
       PatchSet ps = cd.patchSet(psId);
       if (ps == null) {
         log.warn("Patch set {} not found in change {}.", psId.get(), changeId.get());
