You are right. Both which and that can be used as restrictive pronouns, while only which can be used non-restrictively. That is often used for people; which is suspect in that use-- it seems to appear almost exclusively in the Bible.
New words, one handy idiom, and a 2-minute quiz — delivered to your inbox to keep your streak alive.