Fixed it for me :)

Accidentally dismissed a notification on the dashboard after clicking update, and that apparently stopped the update process, resulting in the lock. After waiting for a while, with no indication that things would change, I removed the lock using this plugin (too lazy to login to myphp), and performed a full update. Worked like a charm.