It was the electric lock, but for the life of me I can't remember which piece broke (solenoid stuck locked maybe?), I brought it to a shop and they somehow got in there and took the part out (for cheap I may add, took less than an hour) now I have a manual locking passenger door.

Just thought I would put some closure to this thread.