Macbook locked with icloud
After locking a Mac with iCloud, a normal reboot (no Option or other modifier keys) should take you to an unlock screen. Enter the PIN there, and it should fully unlock the Mac (unlike entering the PIN after holding Option, which just temporarily bypasses the lock). Is this now working on your Mac?