diff --git a/.pick_status.json b/.pick_status.json
index 59611468cc3..7874ce74390 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1075,7 +1075,7 @@
         "description": "nir/opt_move: fix handling of if-condition",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "8a78706643ecad8a1f303cc9358873abc29978b4"
     },
diff --git a/src/compiler/nir/nir_opt_move.c b/src/compiler/nir/nir_opt_move.c
index 9aeb9f4cf86..25b92543b1c 100644
--- a/src/compiler/nir/nir_opt_move.c
+++ b/src/compiler/nir/nir_opt_move.c
@@ -70,7 +70,7 @@ nir_opt_move_block(nir_block *block, nir_move_options options)
    nir_instr *last_instr = nir_block_ends_in_jump(block) ?
                            nir_block_last_instr(block) : NULL;
    const nir_if *iff = nir_block_get_following_if(block);
-   const nir_instr *if_cond_instr = iff ? iff->condition.parent_instr : NULL;
+   const nir_instr *if_cond_instr = iff ? iff->condition.ssa->parent_instr : NULL;
 
    /* Walk the instructions backwards.
     * The instructions get indexed while iterating.
diff --git a/src/gallium/drivers/zink/ci/traces-zink.yml b/src/gallium/drivers/zink/ci/traces-zink.yml
index 8a43a4bdc95..2d4ebbf76ea 100644
--- a/src/gallium/drivers/zink/ci/traces-zink.yml
+++ b/src/gallium/drivers/zink/ci/traces-zink.yml
@@ -31,7 +31,7 @@ traces:
       checksum: 433b69bea68cfe81914b857bbdc60ea5
   gputest/pixmark-piano-v2.trace:
     gl-zink-anv-tgl:
-      checksum: acdfae98a5a31da0a4450af4eea00aa1
+      checksum: 30a5073830e15db17f5c060be32c5708
   gputest/triangle-v2.trace:
     gl-zink-anv-tgl:
       checksum: 5f694874b15bcd7a3689b387c143590b