diff --git a/testdata/list_todos.json b/testdata/list_todos.json
index 8b785972d..31043d2fb 100644
--- a/testdata/list_todos.json
+++ b/testdata/list_todos.json
@@ -11,7 +11,7 @@
     "id": 2,
     "state": "pending",
     "target": {
-      "id": 2,
+      "id": "1d76d1b2e3e886108f662765c97f4687f4134d8c",
       "approvals_before_merge": null
     }
   }
diff --git a/todos.go b/todos.go
index 7ea26d01b..52c218ee0 100644
--- a/todos.go
+++ b/todos.go
@@ -58,8 +58,8 @@ type TodoTarget struct {
 	CreatedAt            *time.Time             `json:"created_at"`
 	Description          string                 `json:"description"`
 	Downvotes            int                    `json:"downvotes"`
-	ID                   int                    `json:"id"`
-	IID                  interface{}            `json:"iid"`
+	ID                   interface{}            `json:"id"`
+	IID                  int                    `json:"iid"`
 	Labels               []string               `json:"labels"`
 	Milestone            *Milestone             `json:"milestone"`
 	ProjectID            int                    `json:"project_id"`
diff --git a/todos_test.go b/todos_test.go
index 0ad75d429..8efb52659 100644
--- a/todos_test.go
+++ b/todos_test.go
@@ -36,7 +36,10 @@ func TestListTodos(t *testing.T) {
 
 	require.NoError(t, err)
 
-	want := []*Todo{{ID: 1, State: "pending", Target: &TodoTarget{ID: 1, ApprovalsBeforeMerge: 2}}, {ID: 2, State: "pending", Target: &TodoTarget{ID: 2}}}
+	want := []*Todo{
+		{ID: 1, State: "pending", Target: &TodoTarget{ID: float64(1), ApprovalsBeforeMerge: 2}},
+		{ID: 2, State: "pending", Target: &TodoTarget{ID: "1d76d1b2e3e886108f662765c97f4687f4134d8c"}},
+	}
 	require.Equal(t, want, todos)
 }