diff --git a/src/main/java/com/googlesource/gerrit/plugins/findowners/Action.java b/src/main/java/com/googlesource/gerrit/plugins/findowners/Action.java
index 903ced0..d6a182d 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/findowners/Action.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/findowners/Action.java
@@ -139,7 +139,7 @@
   /** Returns the current patchset number or the given patchsetNum if it is valid. */
   static int getValidPatchsetNum(ChangeData changeData, Integer patchsetNum)
       throws StorageException, BadRequestException {
-    int patchset = changeData.currentPatchSet().getId().get();
+    int patchset = changeData.currentPatchSet().id().get();
     if (patchsetNum != null) {
       if (patchsetNum < 1 || patchsetNum > patchset) {
         throw new BadRequestException(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/findowners/Cache.java b/src/main/java/com/googlesource/gerrit/plugins/findowners/Cache.java
index 1659ea6..0c2af59 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/findowners/Cache.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/findowners/Cache.java
@@ -106,7 +106,7 @@
         repoManager,
         configFactory,
         changeData,
-        changeData.currentPatchSet().getId().get());
+        changeData.currentPatchSet().id().get());
   }
 
   /** Returns a cached or new OwnersDb, for the specified patchset. */