have u tried Safecracker, it has the same type of puzzles, just not enough of them!! story is tedious at best but the puzzles are quite challenging. Hope this helps u out :-)
or if u liked the matchstick puzzles in 1 of the layton games (cant remember which 1) then there is a game simply called matchstick, no story just matchstick puzzles...